From f8a96fcd070c2edf1e01aeccce14476ca2478eaf Mon Sep 17 00:00:00 2001 From: "Aaron M. Ucko" Date: Thu, 16 Oct 2025 16:10:18 -0400 Subject: [PATCH] Stick with software CRC-32C on 32-bit ARM (#1117022). * debian/control: Restrict armv8crc-support dependency to arm64. * debian/patches/zcf-simde-crc32c: Leave CFLAGS alone on 32-bit ARM; adjustments aren't actually worthwhile there and would have needed to go further on armhf, on which (at least under GCC) ARMv8 targets additionally need +simd. (Closes: #1117022.) --- debian/changelog | 7 ++++++- debian/control | 2 +- debian/patches/zcf-simde-crc32c | 10 ++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4566f312..c8f66fef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ ncbi-blast+ (2.17.0+ds-3) UNRELEASED; urgency=medium * NOT RELEASED YET. + * debian/control: Restrict armv8crc-support dependency to arm64. + * debian/patches/zcf-simde-crc32c: Leave CFLAGS alone on 32-bit ARM; + adjustments aren't actually worthwhile there and would have needed to + go further on armhf, on which (at least under GCC) ARMv8 targets + additionally need +simd. (Closes: #1117022.) - -- Aaron M. Ucko Thu, 16 Oct 2025 15:54:56 -0400 + -- Aaron M. Ucko Thu, 16 Oct 2025 16:10:17 -0400 ncbi-blast+ (2.17.0+ds-2) unstable; urgency=medium diff --git a/debian/control b/debian/control index 4e04f26c..128f069c 100644 --- a/debian/control +++ b/debian/control @@ -35,7 +35,7 @@ Package: ncbi-blast+ Architecture: any Multi-Arch: foreign Depends: - armv8crc-support [any-arm arm64], + armv8crc-support [arm64], ncbi-data, python3, sse4.2-support [any-amd64 any-i386 any-x32], diff --git a/debian/patches/zcf-simde-crc32c b/debian/patches/zcf-simde-crc32c index 939b1387..8bd68888 100644 --- a/debian/patches/zcf-simde-crc32c +++ b/debian/patches/zcf-simde-crc32c @@ -30,3 +30,13 @@ /* =========================================================================== * Insert string str in the dictionary and return the previous head * of the hash chain (the most recent string with same hash key). +--- a/c++/src/util/compress/zlib_cloudflare/Makefile.zlib_cf.lib.unix ++++ b/c++/src/util/compress/zlib_cloudflare/Makefile.zlib_cf.lib.unix +@@ -1,6 +1,6 @@ + # $Id: Makefile.zlib_cf.lib.unix 677587 2024-01-18 20:07:53Z ivanov $ + +-ifneq "" "$(findstring --arm,$(signature))$(findstring --aarch64,$(signature))" ++ifneq "" "$(findstring --arm64,$(signature))$(findstring --aarch64,$(signature))" + crc32.o: CFLAGS += -march=armv8-a+crc + deflate.o: CFLAGS += -march=armv8-a+crc + endif -- 2.30.2